Skip to content

Fix version info missing#1228

Closed
daixiang0 wants to merge 2 commits intografana:masterfrom
daixiang0:version
Closed

Fix version info missing#1228
daixiang0 wants to merge 2 commits intografana:masterfrom
daixiang0:version

Conversation

@daixiang0
Copy link
Copy Markdown
Contributor

@daixiang0 daixiang0 commented Nov 4, 2019

Fix #1208

If GO111MODULE does not turn on, set mod as vendor would make version info miss,

Signed-off-by: Xiang Dai 764524258@qq.com

@daixiang0
Fix version info missing
b58d5ee 
Signed-off-by: Xiang Dai <764524258@qq.com>
@daixiang0
update VPREFIX
57342a7 
Signed-off-by: Xiang Dai <764524258@qq.com>
@daixiang0
Copy link
Copy Markdown
Contributor Author

daixiang0 commented Nov 6, 2019

@slim-bean @rfratto @cyriltovena mind hava a look?

@slim-bean
Copy link
Copy Markdown
Collaborator

slim-bean commented Nov 8, 2019

This overlaps some of the work done in #1095, however that PR looks more complete so I'd like to get that merged first and see if we still need this change.

pstibrany
pstibrany reviewed Nov 8, 2019
View reviewed changes
@daixiang0
Copy link
Copy Markdown
Contributor Author

daixiang0 commented Nov 27, 2019

@slim-bean #1095 not fix this:

[root@test loki]# make cmd/loki/loki
CGO_ENABLED=0 go build -ldflags "-extldflags \"-static\" -s -w -X github.com/grafana/loki/vendor/github.com/prometheus/common/version.Branch=master -X github.com/grafana/loki/vendor/github.com/prometheus/common/version.Version=master-125cfbf -X github.com/grafana/loki/vendor/github.com/prometheus/common/version.Revision=125cfbf -X github.com/grafana/loki/vendor/github.com/prometheus/common/version.BuildUser=root@test.localdomain -X github.com/grafana/loki/vendor/github.com/prometheus/common/version.BuildDate=2019-11-27T11:12:14Z" -tags netgo -mod vendor -o cmd/loki/loki ./cmd/loki
[root@test loki]# ./cmd/loki/loki --version
loki, version  (branch: , revision: )
  build user:       
  build date:       
  go version:       go1.13.4
[root@test loki]# GO111MODULE=on make cmd/loki/loki
CGO_ENABLED=0 go build -ldflags "-extldflags \"-static\" -s -w -X github.com/grafana/loki/vendor/github.com/prometheus/common/version.Branch=master -X github.com/grafana/loki/vendor/github.com/prometheus/common/version.Version=master-125cfbf -X github.com/grafana/loki/vendor/github.com/prometheus/common/version.Revision=125cfbf -X github.com/grafana/loki/vendor/github.com/prometheus/common/version.BuildUser=root@test.localdomain -X github.com/grafana/loki/vendor/github.com/prometheus/common/version.BuildDate=2019-11-27T11:13:12Z" -tags netgo -mod vendor -o cmd/loki/loki ./cmd/loki
[root@test loki]# ./cmd/loki/loki --version
loki, version  (branch: , revision: )
  build user:       
  build date:       
  go version:       go1.13.4

@pstibrany
Copy link
Copy Markdown
Contributor

pstibrany commented Nov 27, 2019 •
edited
Loading

-X github.com/grafana/loki/vendor/github.com/prometheus/common/version.Branch=master

if you still see this, then you're not using Makefile from #1095. It should look like this:

$ make cmd/loki/loki
CGO_ENABLED=0 go build -ldflags "-extldflags \"-static\" -s -w -X github.com/grafana/loki/pkg/loki.Branch=modvendor -X github.com/grafana/loki/pkg/loki.Version=modvendor-f5bf77d -X github.com/grafana/loki/pkg/loki.Revision=f5bf77da -X github.com/grafana/loki/pkg/loki.BuildUser=peter@Peters-iMac.local -X github.com/grafana/loki/pkg/loki.BuildDate=2019-11-27T11:18:23Z" -tags netgo -mod=vendor -o cmd/loki/loki ./cmd/loki

(it wasn't yet merged)

@daixiang0
Copy link
Copy Markdown
Contributor Author

daixiang0 commented Nov 28, 2019

oh my mistake, wait for merge! @pstibrany

@tombrk
Copy link
Copy Markdown
Member

tombrk commented Nov 30, 2019

Closing in favor of #1095.

In case there is still something valuable in here, please open a new PR

@tombrk tombrk closed this Nov 30, 2019
@daixiang0 daixiang0 deleted the version branch December 2, 2019 01:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pstibrany pstibrany pstibrany left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

v0.4.0: x_build_info isn't emitting version anymore.

4 participants

@daixiang0 @slim-bean @pstibrany @tombrk